Merge (with trepidation).
authoremellor@ewan <emellor@ewan>
Wed, 5 Oct 2005 13:40:35 +0000 (14:40 +0100)
committeremellor@ewan <emellor@ewan>
Wed, 5 Oct 2005 13:40:35 +0000 (14:40 +0100)

Trivial merge